solved merge conflict
authorJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 24 Jul 2020 08:01:04 +0000 (10:01 +0200)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 24 Jul 2020 08:01:04 +0000 (10:01 +0200)
commit144fbef143de5203eb776fd84d4a49eb9b0388b8
tree440bfa87f1d018e6144ece5e9223f4678a445b4e
parenta8ace2dc528a629ad293b8fee30c441a0f685dfe
parent489a1412987c75734f51fae9c46933272594ee62
solved merge conflict
src/siri/db/listener.c